Rene Engelhard [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
Merge libreoffice (1:6.0.2-1) import into refs/heads/workingbranch
Kohei Yoshida [Thu, 1 Feb 2018 02:27:44 +0000 (21:27 -0500)]
Update orcus to 0.13.3 and make necessary adjustments.
This is a collection of the following:
(cherry picked from commit
20945a9a4de6684010fd5b3603595e6da543807d)
(cherry picked from commit
a1c36eff089c3cd695bd78090575ca1c7677121e)
(cherry picked from commit
45a4e70484e7d90dab07a677914ada2d948b415c)
with all necessary changes to resolve conflicts & preserve correct
handling of font and cell background color imports.
Change-Id: I08eb3495adf74858bb23a84245a9923ebe2a13e2
Reviewed-on: https://gerrit.libreoffice.org/50213
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Gbp-Pq: Name orcus-0.13.3.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
apparmor-fixes
see https://gerrit.libreoffice.org/#/c/49614/.
sysui/desktop/apparmor/program.senddoc
Line 19:
why do we need to allow dbus, chrome, .. here?
See https://sources.debian.org/src/apparmor/2.12-2/profiles/apparmor.d/abstractions/ubuntu-helpers/.
(Besides that I don't like the "ubuntu" there at all, but that is an other story)
sysui/desktop/apparmor/program.senddoc
Line 19:
The other (easy) option is to have xdg-* just go to unconfined. I'm not sure there will be a huge difference in security.
The initial version got merged to libreoffice-6-0 without the master one being
merged...
Gbp-Pq: Name apparmor-fixes.diff
Olivier Tilloy [Mon, 8 Jan 2018 15:59:17 +0000 (16:59 +0100)]
tdf#114915 Apparmor profile update (invalid comments syntax)
The apparmor profile parser doesn't interpret # as a comment when on the same
line as a variable assignment. Ensure that comments are on their own line,
above the actual assignment.
Change-Id: If10bb05f11b0e9026746db2e271113f30da5cbef
Reviewed-on: https://gerrit.libreoffice.org/47605
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Gbp-Pq: Name apparmor-profiles-comments.patch
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
apparmor-complain
Gbp-Pq: Name apparmor-complain.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
apparmor-usrmerge
Gbp-Pq: Name apparmor-usrmerge.diff
Stephan Bergmann [Mon, 4 Dec 2017 20:33:35 +0000 (21:33 +0100)]
Condition for definition of LastIdent must match condition for its use
Condition for definition of LastIdent must match condition for its use
Change-Id: Iccc58d396d8c80a717e9d33ed8d872aadea08afa
Gbp-Pq: Name sal-fix-kfreebsd-build.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
tdf108963-test
PDF got exported and the text rotated. Somehow we get 40/36, though. But as it
gets rotated, adapt the values so that the test passes...
Gbp-Pq: Name tdf108963-test.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
disable-tests-somehow-needing-more-fonts
These tests are using Liberation and/or Arial. Those should be present by our
build-deps (and other tests work...) but somehow they fail here. They *do*
work with a --without-fonts build, though.
Gbp-Pq: Name disable-tests-somehow-needing-more-fonts.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
disable-unused-test-programs
Gbp-Pq: Name disable-unused-test-programs.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
cppunit-optional
Gbp-Pq: Name cppunit-optional.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
disable-some-sc-tests-with-internal-cppunit
# fails with internal cppunit:
#
# [build LNK] CppunitTest/libtest_sc_subsequent_filters_test.so
# S=/data/rene/git/LibreOffice/master && I=$S/instdir && W=$S/workdir && /usr/bin/ccache x86_64-linux-gnu-g++ -shared -Wl,-z,noexecstack -Wl,-z,origin '-Wl,-rpath,$ORIGIN/../Library' -Wl,-rpath-link,$I/program -Wl,-z,defs -Wl,-rpath-link,/lib:/usr/lib -Wl,-z,combreloc -Wl,--hash-style=gnu -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo -Wl,-Bsymbolic-functions -L$W/LinkTarget/StaticLibrary -L$I/sdk/lib -L$I/program -L$I/program -L$W/LinkTarget/Library -Wl,-z,relro -L/usr/lib/x86_64-linux-gnu -L/usr/lib/x86_64-linux-gnu -L/usr/lib/x86_64-linux-gnu $W/CxxObject/sc/qa/unit/subsequent_filters-test.o -Wl,--start-group -L$W/UnpackedTarball/cppunit/src/cppunit/.libs -lcppunit -lxml2 -lorcus-0.12 -lorcus-parser-0.12 -lboost_filesystem -lboost_iostreams -lz -Wl,--end-group -Wl,--no-as-needed -lmergedlo -luno_cppu -luno_cppuhelpergcc3 -lforlo -lforuilo -li18nlangtag -looxlo -luno_sal -luno_salhelpergcc3 -lsclo -lscqahelper -lsubsequenttest -ltest -lunotest -lvbahelperlo -o $W/LinkTarget/CppunitTest/libtest_sc_subsequent_filters_test.so
# /data/rene/git/LibreOffice/master/workdir/CxxObject/sc/qa/unit/subsequent_filters-test.o:(.data.rel.ro._ZTIN7CppUnit17AdditionalMessageE[_ZTIN7CppUnit17AdditionalMessageE]+0x10): undefined reference to `typeinfo for CppUnit::Message'
# collect2: error: ld returned 1 exit status
# /data/rene/git/LibreOffice/master/solenv/gbuild/LinkTarget.mk:598: recipe for target '/data/rene/git/LibreOffice/master/workdir/LinkTarget/CppunitTest/libtest_sc_subsequent_filters_test.so' failed
# make[4]: *** [/data/rene/git/LibreOffice/master/workdir/LinkTarget/CppunitTest/libtest_sc_subsequent_filters_test.so] Error 1
#
# interestingly, this works with system-cppunit...
Gbp-Pq: Name disable-some-sc-tests-with-internal-cppunit.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
no-openssl
don't add -lssl etc if not needed (because we use system-postgresql)
Gbp-Pq: Name no-openssl.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
system-officeotron-and-odfvalidator
Gbp-Pq: Name system-officeotron-and-odfvalidator.diff
Rene Engelhard [Sun, 21 Feb 2016 01:20:43 +0000 (02:20 +0100)]
Revert "always support packagekit if dbus is enabled"
This reverts commit
f2984e95740cfbb9c74574f2a1225af3411d4901.
Gbp-Pq: Name no-packagekit-per-default.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
hppa-is-32bit
Gbp-Pq: Name hppa-is-32bit.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
odk-no-dot
Gbp-Pq: Name odk-no-dot.diff
Bjoern Michaelsen [Wed, 12 Mar 2014 16:49:28 +0000 (17:49 +0100)]
make ConnectivityTools a normal target, so we can pack it
Gbp-Pq: Name build-connectivitytools.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
javadoc-optional
Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.
Gbp-Pq: Name javadoc-optional.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
fix-internal-hsqldb-build
Gbp-Pq: Name fix-internal-hsqldb-build.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
disable-flaky-tests
Gbp-Pq: Name disable-flaky-tests.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
debian-hardened-buildflags-no-LO-fstack-protector-strong
don't hardcode -fstack-protector-strong in configure.ac/gbuild. We get the
hardening flags from dpkg-buildflags anyway.
Gbp-Pq: Name debian-hardened-buildflags-no-LO-fstack-protector-strong.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
debian-hardened-buildflags-CPPFLAGS
Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
mediwiki-oor-replace
Gbp-Pq: Name mediwiki-oor-replace.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
make-package-modules-not-suck
Gbp-Pq: Name make-package-modules-not-suck.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
mysqlcppconn-libmysqlclient-SONAME
Gbp-Pq: Name mysqlcppconn-libmysqlclient-SONAME.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
jdbc-driver-classpaths
Gbp-Pq: Name jdbc-driver-classpaths.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
reportdesign-mention-package
Gbp-Pq: Name reportdesign-mention-package.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
sensible-lomua
===================================================================
Gbp-Pq: Name sensible-lomua.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
help-msg-add-package-info
Gbp-Pq: Name help-msg-add-package-info.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
mention-java-common-package
Gbp-Pq: Name mention-java-common-package.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
install-fixes
Gbp-Pq: Name install-fixes.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
build-against-shared-lpsolve
Gbp-Pq: Name build-against-shared-lpsolve.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
debian-debug
Gbp-Pq: Name debian-debug.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
split-evoab
Gbp-Pq: Name split-evoab.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
jurt-soffice-location
commit
b71107fb12e3c3125e0cb62c5a4f6636a80c6408
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
AuthorDate: Tue Jun 7 11:52:37 2011 +0200
Commit: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
CommitDate: Tue Jun 7 11:52:37 2011 +0200
on debian-based systems, we know where our soffice binary is
Gbp-Pq: Name jurt-soffice-location.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
debian-opt
Gbp-Pq: Name debian-opt.diff
Debian LibreOffice Maintainers [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
no-check-if-root
Gbp-Pq: Name no-check-if-root.diff
Rene Engelhard [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
libreoffice (1:6.0.2-1) unstable; urgency=medium
[ Rene Engelhard ]
* New upstream release
* debian/patches/orcus-0.13.3.diff: backport patches to fix build/tests
against orcus 0.13.3
* debian/patches/disable-some-sc-tests-with-internal-cppunit.diff: update
* debian/watch: update for the multiple tarballs
* debian/copyright: remove Files-Excluded: for files already removed by
upstreams pack script anyway to allow mk-origtargz doing --symlink
* debian/scripts/mk-origtargz: own mk-origtargz..
* debian/rules:
- --disable-pdfium on arm64
- actually build without -g if ENABLE_SYMBOLS=n
- add get-orig-source target for "real" upstream tarballs
- fix libvisio dependency
- bump runtime (and test) depends for liborcus to >= 0.13.3
* debian/control.in:
- recommend xdg-utils in -common (for xdg-{open,email})
[ Olivier Tilloy ]
* debian/rules: define ${java-common-depends} when building
libreoffice-wiki-publisher and libreoffice-nlpsolver (closes: #891765)
[dgit import unpatched libreoffice 1:6.0.2-1]
Rene Engelhard [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
Import libreoffice_6.0.2.orig.tar.xz
[dgit import orig libreoffice_6.0.2.orig.tar.xz]
Rene Engelhard [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
Import libreoffice_6.0.2.orig-helpcontent2.tar.xz
[dgit import orig libreoffice_6.0.2.orig-helpcontent2.tar.xz]
Rene Engelhard [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
Import libreoffice_6.0.2.orig-translations.tar.xz
[dgit import orig libreoffice_6.0.2.orig-translations.tar.xz]
Rene Engelhard [Wed, 28 Feb 2018 17:37:57 +0000 (17:37 +0000)]
Import libreoffice_6.0.2-1.debian.tar.xz
[dgit import tarball libreoffice 1:6.0.2-1 libreoffice_6.0.2-1.debian.tar.xz]
Rene Engelhard [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
Merge libreoffice (1:6.0.1-1) import into refs/heads/workingbranch
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
apparmor-complain
Gbp-Pq: Name apparmor-complain.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
apparmor-usrmerge
Gbp-Pq: Name apparmor-usrmerge.diff
Stephan Bergmann [Mon, 4 Dec 2017 20:33:35 +0000 (21:33 +0100)]
Condition for definition of LastIdent must match condition for its use
Condition for definition of LastIdent must match condition for its use
Change-Id: Iccc58d396d8c80a717e9d33ed8d872aadea08afa
Gbp-Pq: Name sal-fix-kfreebsd-build.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
tdf108963-test
PDF got exported and the text rotated. Somehow we get 40/36, though. But as it
gets rotated, adapt the values so that the test passes...
Gbp-Pq: Name tdf108963-test.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
disable-tests-somehow-needing-more-fonts
These tests are using Liberation and/or Arial. Those should be present by our
build-deps (and other tests work...) but somehow they fail here. They *do*
work with a --without-fonts build, though.
Gbp-Pq: Name disable-tests-somehow-needing-more-fonts.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
disable-unused-test-programs
Gbp-Pq: Name disable-unused-test-programs.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
cppunit-optional
Gbp-Pq: Name cppunit-optional.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
disable-some-sc-tests-with-internal-cppunit
# fails with internal cppunit:
#
# [build LNK] CppunitTest/libtest_sc_subsequent_filters_test.so
# S=/data/rene/git/LibreOffice/master && I=$S/instdir && W=$S/workdir && /usr/bin/ccache x86_64-linux-gnu-g++ -shared -Wl,-z,noexecstack -Wl,-z,origin '-Wl,-rpath,$ORIGIN/../Library' -Wl,-rpath-link,$I/program -Wl,-z,defs -Wl,-rpath-link,/lib:/usr/lib -Wl,-z,combreloc -Wl,--hash-style=gnu -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo -Wl,-Bsymbolic-functions -L$W/LinkTarget/StaticLibrary -L$I/sdk/lib -L$I/program -L$I/program -L$W/LinkTarget/Library -Wl,-z,relro -L/usr/lib/x86_64-linux-gnu -L/usr/lib/x86_64-linux-gnu -L/usr/lib/x86_64-linux-gnu $W/CxxObject/sc/qa/unit/subsequent_filters-test.o -Wl,--start-group -L$W/UnpackedTarball/cppunit/src/cppunit/.libs -lcppunit -lxml2 -lorcus-0.12 -lorcus-parser-0.12 -lboost_filesystem -lboost_iostreams -lz -Wl,--end-group -Wl,--no-as-needed -lmergedlo -luno_cppu -luno_cppuhelpergcc3 -lforlo -lforuilo -li18nlangtag -looxlo -luno_sal -luno_salhelpergcc3 -lsclo -lscqahelper -lsubsequenttest -ltest -lunotest -lvbahelperlo -o $W/LinkTarget/CppunitTest/libtest_sc_subsequent_filters_test.so
# /data/rene/git/LibreOffice/master/workdir/CxxObject/sc/qa/unit/subsequent_filters-test.o:(.data.rel.ro._ZTIN7CppUnit17AdditionalMessageE[_ZTIN7CppUnit17AdditionalMessageE]+0x10): undefined reference to `typeinfo for CppUnit::Message'
# collect2: error: ld returned 1 exit status
# /data/rene/git/LibreOffice/master/solenv/gbuild/LinkTarget.mk:598: recipe for target '/data/rene/git/LibreOffice/master/workdir/LinkTarget/CppunitTest/libtest_sc_subsequent_filters_test.so' failed
# make[4]: *** [/data/rene/git/LibreOffice/master/workdir/LinkTarget/CppunitTest/libtest_sc_subsequent_filters_test.so] Error 1
#
# interestingly, this works with system-cppunit...
Gbp-Pq: Name disable-some-sc-tests-with-internal-cppunit.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
no-openssl
don't add -lssl etc if not needed (because we use system-postgresql)
Gbp-Pq: Name no-openssl.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
system-officeotron-and-odfvalidator
Gbp-Pq: Name system-officeotron-and-odfvalidator.diff
Rene Engelhard [Sun, 21 Feb 2016 01:20:43 +0000 (02:20 +0100)]
Revert "always support packagekit if dbus is enabled"
This reverts commit
f2984e95740cfbb9c74574f2a1225af3411d4901.
Gbp-Pq: Name no-packagekit-per-default.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
hppa-is-32bit
Gbp-Pq: Name hppa-is-32bit.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
odk-no-dot
Gbp-Pq: Name odk-no-dot.diff
Bjoern Michaelsen [Wed, 12 Mar 2014 16:49:28 +0000 (17:49 +0100)]
make ConnectivityTools a normal target, so we can pack it
Gbp-Pq: Name build-connectivitytools.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
javadoc-optional
Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.
Gbp-Pq: Name javadoc-optional.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
fix-internal-hsqldb-build
Gbp-Pq: Name fix-internal-hsqldb-build.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
disable-flaky-tests
Gbp-Pq: Name disable-flaky-tests.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
debian-hardened-buildflags-no-LO-fstack-protector-strong
don't hardcode -fstack-protector-strong in configure.ac/gbuild. We get the
hardening flags from dpkg-buildflags anyway.
Gbp-Pq: Name debian-hardened-buildflags-no-LO-fstack-protector-strong.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
debian-hardened-buildflags-CPPFLAGS
Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
mediwiki-oor-replace
Gbp-Pq: Name mediwiki-oor-replace.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
make-package-modules-not-suck
Gbp-Pq: Name make-package-modules-not-suck.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
mysqlcppconn-libmysqlclient-SONAME
Gbp-Pq: Name mysqlcppconn-libmysqlclient-SONAME.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
jdbc-driver-classpaths
Gbp-Pq: Name jdbc-driver-classpaths.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
reportdesign-mention-package
Gbp-Pq: Name reportdesign-mention-package.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
sensible-lomua
===================================================================
Gbp-Pq: Name sensible-lomua.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
help-msg-add-package-info
Gbp-Pq: Name help-msg-add-package-info.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
mention-java-common-package
Gbp-Pq: Name mention-java-common-package.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
install-fixes
Gbp-Pq: Name install-fixes.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
build-against-shared-lpsolve
Gbp-Pq: Name build-against-shared-lpsolve.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
debian-debug
Gbp-Pq: Name debian-debug.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
split-evoab
Gbp-Pq: Name split-evoab.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
jurt-soffice-location
commit
b71107fb12e3c3125e0cb62c5a4f6636a80c6408
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
AuthorDate: Tue Jun 7 11:52:37 2011 +0200
Commit: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
CommitDate: Tue Jun 7 11:52:37 2011 +0200
on debian-based systems, we know where our soffice binary is
Gbp-Pq: Name jurt-soffice-location.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
debian-opt
Gbp-Pq: Name debian-opt.diff
Debian LibreOffice Maintainers [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
no-check-if-root
Gbp-Pq: Name no-check-if-root.diff
Rene Engelhard [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
libreoffice (1:6.0.1-1) unstable; urgency=high
* New upstream snapshot
- fixes CVE-2018-1055: libreoffice: Remote arbitrary file disclosure
vulnerability via WEBSERVICE formula
* debian/control.in: bump ure Depends for -core to (>= 6.0.0~)
(closes: #889074)
* debian/rules:
- use internal mdds for stretch-backports
* debian/tests/control: make uicheck depend on libreoffice-l10n-{he,ja}
for the text direction UI Test
* merge from Ubuntu:
- Bump shlibs overrides for libvisio and orcus
[dgit import unpatched libreoffice 1:6.0.1-1]
Rene Engelhard [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
Import libreoffice_6.0.1.orig.tar.xz
[dgit import orig libreoffice_6.0.1.orig.tar.xz]
Rene Engelhard [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
Import libreoffice_6.0.1.orig-helpcontent2.tar.xz
[dgit import orig libreoffice_6.0.1.orig-helpcontent2.tar.xz]
Rene Engelhard [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
Import libreoffice_6.0.1.orig-translations.tar.xz
[dgit import orig libreoffice_6.0.1.orig-translations.tar.xz]
Rene Engelhard [Thu, 8 Feb 2018 18:29:39 +0000 (18:29 +0000)]
Import libreoffice_6.0.1-1.debian.tar.xz
[dgit import tarball libreoffice 1:6.0.1-1 libreoffice_6.0.1-1.debian.tar.xz]
Rene Engelhard [Mon, 29 Jan 2018 17:52:54 +0000 (17:52 +0000)]
Merge libreoffice (1:6.0.0-1) import into refs/heads/workingbranch
Rene Engelhard [Sun, 28 Jan 2018 18:48:25 +0000 (19:48 +0100)]
fix build with glm 0.9.9
In file included from /usr/include/glm/gtx/norm.hpp:18:0,
from /data/rene/git/LibreOffice/master/vcl/inc/opengl/VertexUti
ls.hxx:16,
from /data/rene/git/LibreOffice/master/vcl/inc/opengl/LineRende
rUtils.hxx:14,
from /data/rene/git/LibreOffice/master/vcl/opengl/LineRenderUti
ls.cxx:11:
/usr/include/glm/gtx/quaternion.hpp:23:3: error: #error "GLM: GLM_GTX_quaternion
is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
# error "GLM: GLM_GTX_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
^~~~~
so just define it.
Change-Id: I981bfb5fd944f32a3774b3f9b183989773bf235f
Gbp-Pq: Name glm-0.9.9.diff
Debian LibreOffice Maintainers [Mon, 29 Jan 2018 17:52:54 +0000 (17:52 +0000)]
temporary-buildfix
mv /data/rene/Debian/Pakete/LibreOffice/libreoffice/libreoffice-6.0.0.3/workdir/Dep/LinkTarget/CppunitTest/libtest_sw_uiwriter.so.d.tmp /data/rene/Debian/Pakete/LibreOffice/libreoffice/libreoffice-6.0.0.3/workdir/Dep/LinkTarget/CppunitTest/libtest_sw_uiwriter.so.d
S=/data/rene/Debian/Pakete/LibreOffice/libreoffice/libreoffice-6.0.0.3 && I=$S/instdir && W=$S/workdir && x86_64-linux-gnu-g++ -shared -Wl,-z,noexecstack -Wl,-z,origin '-Wl,-rpath,$ORIGIN/../Library' -Wl,-rpath-link,$I/program -Wl,-z,defs -Wl,-rpath-link,/lib:/usr/lib -Wl,-z,combreloc -Wl,--hash-style=gnu -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo -Wl,-Bsymbolic-functions -L$W/LinkTarget/StaticLibrary -L$I/sdk/lib -L$I/program -L$I/program -L$W/LinkTarget/Library -Wl,-z,relro $W/CxxObject/sw/qa/extras/uiwriter/uiwriter.o -Wl,--start-group -lcppunit -lxml2 -Wl,--end-group -Wl,--no-as-needed -lmergedlo -luno_cppu -luno_cppuhelpergcc3 -lmswordlo -luno_sal -lswlo -ltest -lunotest -o $W/LinkTarget/CppunitTest/libtest_sw_uiwriter.so
/data/rene/Debian/Pakete/LibreOffice/libreoffice/libreoffice-6.0.0.3/workdir/CxxObject/sw/qa/extras/uiwriter/uiwriter.o: In Funktion »SwUiWriterTest::addTestsToSuite(CppUnit::TestSuiteBuilderContextBase&)«:
././sw/qa/extras/uiwriter/uiwriter.cxx:461: Warnung: undefinierter Verweis auf »SwUiWriterTest::testTdf114536()«
collect2: error: ld returned 1 exit status
/data/rene/Debian/Pakete/LibreOffice/libreoffice/libreoffice-6.0.0.3/solenv/gbuild/LinkTarget.mk:627: die Regel für Ziel „/data/rene/Debian/Pakete/LibreOffice/libreoffice/libreoffice-6.0.0.3/workdir/LinkTarget/CppunitTest/libtest_sw_uiwriter.so“ scheiterte
whyever... it is there.
Gbp-Pq: Name temporary-buildfix.diff
Debian LibreOffice Maintainers [Mon, 29 Jan 2018 17:52:54 +0000 (17:52 +0000)]
apparmor-complain
Gbp-Pq: Name apparmor-complain.diff
Debian LibreOffice Maintainers [Mon, 29 Jan 2018 17:52:54 +0000 (17:52 +0000)]
apparmor-updates
Gbp-Pq: Name apparmor-updates.diff
Debian LibreOffice Maintainers [Mon, 29 Jan 2018 17:52:54 +0000 (17:52 +0000)]
apparmor-fixes
Gbp-Pq: Name apparmor-fixes.diff
Dominique Leuenberger [Fri, 5 Jan 2018 11:16:03 +0000 (12:16 +0100)]
Allow building with poppler-0.62
Change-Id: Ia627f1628a67dd8ece7d9318639d9ccd06b89765
Reviewed-on: https://gerrit.libreoffice.org/47460
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Gbp-Pq: Name poppler-0.62.diff
Debian LibreOffice Maintainers [Mon, 29 Jan 2018 17:52:54 +0000 (17:52 +0000)]
Debian LibreOffice Maintainers [Mon, 29 Jan 2018 17:52:54 +0000 (17:52 +0000)]
apparmor-usrmerge
Gbp-Pq: Name apparmor-usrmerge.diff
Stephan Bergmann [Mon, 4 Dec 2017 20:33:35 +0000 (21:33 +0100)]
Condition for definition of LastIdent must match condition for its use
Condition for definition of LastIdent must match condition for its use
Change-Id: Iccc58d396d8c80a717e9d33ed8d872aadea08afa
Gbp-Pq: Name sal-fix-kfreebsd-build.diff
Debian LibreOffice Maintainers [Mon, 29 Jan 2018 17:52:54 +0000 (17:52 +0000)]
tdf108963-test
PDF got exported and the text rotated. Somehow we get 40/36, though. But as it
gets rotated, adapt the values so that the test passes...
Gbp-Pq: Name tdf108963-test.diff
Debian LibreOffice Maintainers [Mon, 29 Jan 2018 17:52:54 +0000 (17:52 +0000)]
disable-tests-somehow-needing-more-fonts
These tests are using Liberation and/or Arial. Those should be present by our
build-deps (and other tests work...) but somehow they fail here. They *do*
work with a --without-fonts build, though.
Gbp-Pq: Name disable-tests-somehow-needing-more-fonts.diff
Debian LibreOffice Maintainers [Mon, 29 Jan 2018 17:52:54 +0000 (17:52 +0000)]
disable-unused-test-programs
Gbp-Pq: Name disable-unused-test-programs.diff
Debian LibreOffice Maintainers [Mon, 29 Jan 2018 17:52:54 +0000 (17:52 +0000)]
cppunit-optional
Gbp-Pq: Name cppunit-optional.diff
Debian LibreOffice Maintainers [Mon, 29 Jan 2018 17:52:54 +0000 (17:52 +0000)]
disable-some-sc-tests-with-internal-cppunit
# fails with internal cppunit:
#
# [build LNK] CppunitTest/libtest_sc_subsequent_filters_test.so
# S=/data/rene/git/LibreOffice/master && I=$S/instdir && W=$S/workdir && /usr/bin/ccache x86_64-linux-gnu-g++ -shared -Wl,-z,noexecstack -Wl,-z,origin '-Wl,-rpath,$ORIGIN/../Library' -Wl,-rpath-link,$I/program -Wl,-z,defs -Wl,-rpath-link,/lib:/usr/lib -Wl,-z,combreloc -Wl,--hash-style=gnu -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo -Wl,-Bsymbolic-functions -L$W/LinkTarget/StaticLibrary -L$I/sdk/lib -L$I/program -L$I/program -L$W/LinkTarget/Library -Wl,-z,relro -L/usr/lib/x86_64-linux-gnu -L/usr/lib/x86_64-linux-gnu -L/usr/lib/x86_64-linux-gnu $W/CxxObject/sc/qa/unit/subsequent_filters-test.o -Wl,--start-group -L$W/UnpackedTarball/cppunit/src/cppunit/.libs -lcppunit -lxml2 -lorcus-0.12 -lorcus-parser-0.12 -lboost_filesystem -lboost_iostreams -lz -Wl,--end-group -Wl,--no-as-needed -lmergedlo -luno_cppu -luno_cppuhelpergcc3 -lforlo -lforuilo -li18nlangtag -looxlo -luno_sal -luno_salhelpergcc3 -lsclo -lscqahelper -lsubsequenttest -ltest -lunotest -lvbahelperlo -o $W/LinkTarget/CppunitTest/libtest_sc_subsequent_filters_test.so
# /data/rene/git/LibreOffice/master/workdir/CxxObject/sc/qa/unit/subsequent_filters-test.o:(.data.rel.ro._ZTIN7CppUnit17AdditionalMessageE[_ZTIN7CppUnit17AdditionalMessageE]+0x10): undefined reference to `typeinfo for CppUnit::Message'
# collect2: error: ld returned 1 exit status
# /data/rene/git/LibreOffice/master/solenv/gbuild/LinkTarget.mk:598: recipe for target '/data/rene/git/LibreOffice/master/workdir/LinkTarget/CppunitTest/libtest_sc_subsequent_filters_test.so' failed
# make[4]: *** [/data/rene/git/LibreOffice/master/workdir/LinkTarget/CppunitTest/libtest_sc_subsequent_filters_test.so] Error 1
#
# interestingly, this works with system-cppunit...
Gbp-Pq: Name disable-some-sc-tests-with-internal-cppunit.diff